first set of post recover fixes