vrouter: Post-merge fixes.