Fix machine config local variable name
Clean deferred calls in vbm