Some more platform compatibility changes (mainly different integral number sizes)