Fix issues surfaced by jshint