Small fixes to registration.