Int64 fixes