Fixed a bit more for jslint