Multiple changes to support recovery settings