And more registrations fixes...