Fix conversion type errors