Plug a couple of leaks in xmpp

Change-Id: Ie59985fe5621d338e62d88aef0451e9b7300241b