fix more .cq copy issues