Minor changes by CWB for Hagerman and auto device recovery.