Fixes for VM