Fixed a couple of glitches in vaf-setup