Converted data encoding fixes