more fixes to libvirt