Resolve registration issues