Improve recovery from stuck updates