Grunt optimizations