more fixes for grunt