Major fixes around vmodules