Fix data conversion of enums and strings