Fixing conversion issues