Fixed warnings due to 64 bit ints, etc