Small fixes, up to grunt's released version