Grunt tasks fixes