Fixing grunt build
WIP