Bug fixes at recover-node