Error recovery and related updates