Tweaks to grunt stack