various grunt fixes