fix more encoding problems