More 64bit changes (Changing INT32 constants to INT64 ones)