Small fixes so Grunt builds properly