More -Wconversion fixes