Fixups from jshint scan