Change in typevectors
Cosmetic changes