[tmp] fix more things