Fixed some errors with the new Organization... oops