Conversion updates
Further conversion updates
Proper datatypes in conversion