Made tweaks to grunt