recovery: fix UMS; fix internal/external;