VM execution fixes

Refactoring caused executing issues