Update to work with latest pontarius-xmpp