vw: fix a couple of bugs