Proposed fixes for the "int64_t" build issue