vrouter: Post-merge fixes to enable build on FreeBSD