Fix Grunt, add new build