Fix long conversions