Some more GrantsAPI fixes