After a quick recursive diff, it looks like you're a few versions behind OpenVBX master. Have you considered rebasing your changes off of that?

There are a number of fixes, improvements, and features that have come into play recently.