Trying to fix more encoding problems in the server