Several fixes to the small virtualization tool