Correct data conversions