Some fixes according to jshint