fix more python2 to 3 issues