Fixing registration niggles