Fix places where old VP values were not freed