fix more bugs of runtime