fix more cut-n-paste coding errors