Some grunt tweaks