Changes to make js-lint ok