Grunt updates + small fixes