Fixed issues with grunt