Various fixes from jshint