Fix Vec errors due to vector changes