Fix additional -Wshorten-64-to-32 errros