Fixing some conversions