Fix conversion errors