More fixes for  vm's