Unified int primitives fix

Not all tests pass in C and Java!