bugfixes after updating to dispersy/devel