Fix remaining issues in GroupPermissionAddForm