Fixing registration errors