Fix some jshint violations introduced from wip-bug-fixes work