Fix some failing tests and only process the deferred updates that are necessary,