diff --git a/app/models/Achievement.coffee b/app/models/Achievement.coffee
index 93434d728..b4dc4c0e8 100644
--- a/app/models/Achievement.coffee
+++ b/app/models/Achievement.coffee
@@ -20,7 +20,7 @@ module.exports = class Achievement extends CocoModel
     4: 'achievement-gold'
     5: 'achievement-diamond'
 
-  getStyle: -> Achievement.styleMapping[@get 'difficulty']
+  getStyle: -> Achievement.styleMapping[@get 'difficulty', true]
 
   @defaultImageURL: '/images/achievements/default.png'
 
diff --git a/app/templates/editor/level/related-achievements.jade b/app/templates/editor/level/related-achievements.jade
index 3d0ff9c34..33ff9230f 100644
--- a/app/templates/editor/level/related-achievements.jade
+++ b/app/templates/editor/level/related-achievements.jade
@@ -18,6 +18,6 @@ else
           td(style="width: 20px")
             img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
           td
-            a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name')
-          td= achievement.get('description')
-          td= achievement.get('worth')
+            a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name', true)
+          td= achievement.get('description', true)
+          td= achievement.get('worth', true)
diff --git a/app/views/achievements/AchievementPopup.coffee b/app/views/achievements/AchievementPopup.coffee
index 82e464734..ba2b60add 100644
--- a/app/views/achievements/AchievementPopup.coffee
+++ b/app/views/achievements/AchievementPopup.coffee
@@ -26,11 +26,11 @@ module.exports = class AchievementPopup extends CocoView
     nextLevelXP = User.expForLevel(nextLevel)
     totalExpNeeded = nextLevelXP - currentLevelExp
     expFunction = @achievement.getExpFunction()
-    currentXP = me.get 'points'
+    currentXP = me.get 'points', true
     if @achievement.isRepeatable()
       achievedXP = expFunction(@earnedAchievement.get('previouslyAchievedAmount')) * @achievement.get('worth') if @achievement.isRepeatable()
     else
-      achievedXP = @achievement.get 'worth'
+      achievedXP = @achievement.get 'worth', true
     previousXP = currentXP - achievedXP
     leveledUp = currentXP - achievedXP < currentLevelExp
     #console.debug 'Leveled up' if leveledUp
diff --git a/app/views/editor/level/LevelFeedbackView.coffee b/app/views/editor/level/LevelFeedbackView.coffee
index fa6a0884a..a7cb666ba 100644
--- a/app/views/editor/level/LevelFeedbackView.coffee
+++ b/app/views/editor/level/LevelFeedbackView.coffee
@@ -37,7 +37,7 @@ module.exports = class LevelFeedbackView extends CocoView
     context.allFeedback = []
     context.averageRating = 0
     context.totalRatings = 0
-    if @allFeedback
+    if @allFeedback?.models.length
       context.allFeedback = (m.attributes for m in @allFeedback.models when @allFeedback.models.length < 20 or m.get('review'))
       context.averageRating = _.reduce((m.get('rating') for m in @allFeedback.models), (acc, x) -> acc + (x ? 5)) / (@allFeedback.models.length)
       context.totalRatings = @allFeedback.models.length
diff --git a/app/views/editor/level/modals/NewAchievementModal.coffee b/app/views/editor/level/modals/NewAchievementModal.coffee
index ad022c4f4..69847e26b 100644
--- a/app/views/editor/level/modals/NewAchievementModal.coffee
+++ b/app/views/editor/level/modals/NewAchievementModal.coffee
@@ -18,7 +18,6 @@ module.exports = class NewAchievementModal extends NewModelModal
   getRenderData: ->
     c = super()
     c.level = @level
-    console.debug 'level', c.level
     c
 
   onAchievementSubmitted: (e) ->