Fixed issues with registrations