Fix bugs for grunt@0.4.0~rc2 (more backward compatibility?)