Fixed most issues, save for admin_organization.name update