Attempting to fix Unicode handling issues