Fixes on some grunt tasks