Changes in vm handling