diff --git a/app/lib/surface/CoordinateGrid.coffee b/app/lib/surface/CoordinateGrid.coffee
index 113731141..e5499fdea 100644
--- a/app/lib/surface/CoordinateGrid.coffee
+++ b/app/lib/surface/CoordinateGrid.coffee
@@ -24,8 +24,8 @@ module.exports = class CoordinateGrid extends CocoClass
   toString: -> '<CoordinateGrid>'
 
   build: (worldSize) ->
-    worldWidth = worldSize[0] ? 80
-    worldHeight = worldSize[1] ? 68
+    worldWidth = worldSize[0] or 80
+    worldHeight = worldSize[1] or 68
     @gridContainer = new createjs.Container()
     @gridShape = new createjs.Shape()
     @gridContainer.addChild @gridShape
diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee
index 1a912b555..bedb45d6c 100644
--- a/app/lib/surface/SpriteBoss.coffee
+++ b/app/lib/surface/SpriteBoss.coffee
@@ -224,7 +224,7 @@ module.exports = class SpriteBoss extends CocoClass
       for slot, itemID of thang.inventoryIDs
         item = @world.getThangByID itemID
         unless item.equipped
-          #console.log thang.id, 'equipping', item, 'in', thang.slot, 'Surface-side'
+          console.log thang.id, 'equipping', item, 'in', thang.slot, 'Surface-side, but it cannot equip?' unless item.equip
           item.equip()
           itemsJustEquipped.push item
     return itemsJustEquipped
diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee
index da3252238..ea8b1ac0c 100644
--- a/app/lib/surface/Surface.coffee
+++ b/app/lib/surface/Surface.coffee
@@ -496,8 +496,8 @@ module.exports = Surface = class Surface extends CocoClass
     event =
       deltaX: e.deltaX
       deltaY: e.deltaY
-      screenPos: @mouseScreenPos
       canvas: @canvas
+    event.screenPos = @mouseScreenPos if @mouseScreenPos
     Backbone.Mediator.publish 'surface:mouse-scrolled', event unless @disabled
 
   hookUpChooseControls: ->
diff --git a/app/schemas/subscriptions/surface.coffee b/app/schemas/subscriptions/surface.coffee
index b650b7e6f..3c4c6b25f 100644
--- a/app/schemas/subscriptions/surface.coffee
+++ b/app/schemas/subscriptions/surface.coffee
@@ -143,11 +143,11 @@ module.exports =  # /app/lib/surface
 
   'surface:stage-mouse-up': c.object {required: ['onBackground', 'originalEvent']},
     onBackground: {type: 'boolean'}
-    x: {type: 'number'}
-    y: {type: 'number'}
+    x: {type: ['number', 'undefined']}
+    y: {type: ['number', 'undefined']}
     originalEvent: {type: 'object'}
 
-  'surface:mouse-scrolled': c.object {required: ['deltaX', 'deltaY', 'screenPos', 'canvas']},
+  'surface:mouse-scrolled': c.object {required: ['deltaX', 'deltaY', 'canvas']},
     deltaX: {type: 'number'}
     deltaY: {type: 'number'}
     screenPos: c.object {required: ['x', 'y']},