Use Int instead of Int64 to be friend with 32 bit systems

Use Int instead of Int64 to be friend with 32 bit systems #681