Fixing more encoding issues