Resolving update problems