Part 2 of vanir.cfg updates