Some fix to grunt