Bug-fixes to get diaspora working