More -Wconversion fixes

Lots of 64-bit correction fixes