some fixes for otr with multiple parties