Fixes to pass jshint checks