Fix things for VM