Minor fixes
Moved definitions and added debug build to vvm