Fix registrations