Recovery: fix more build error