Fixed Xmpp issues