Fixing registration bugs.