TS-2019 Fix the "vector inconsistency" errors.