Fixing grunt issues