Fixing xmpp