Fix some issues with registrations