More Wconversion fixes