Fix Data conversions