More minor changes in grunt tasks