Fixed issue with different data type sizes on different OS.