more int64_t fixes