Fix int width problem for 32-bit