More encoding issues solved