bugfixes for apt-cacher, more guests for dev17