Fix vbmod

A set of fixes for my use :)