Minor improvements and bug fixes

* Fixed VM base bug