Miscellaneous tweaks made in the course of testing Extendo P2P