data conversion fixes