Fix some bad xmpp imports