Fixes for change in Dispersy crypto stuff