Fix conversion issues