Fix conversion errors up to comments