Fix conversion warnings