Fix more gcc -Wconversion warnings