Grunt build fixed
Bug fixes