fixes to xmpp