vbridge: A couple of fixes.