Grunt building minor fixes
Building speed up