Follow up latest changes in vrouter