CFY-516 some vagrant changes