Patched up grunt@0.4 issues