Fixed some issues with grunt