Grunt Fixes

Fixes for the grunt build system.