Plug a couple of leaks in xmpp

Change-Id: I1ce05a30f68d00383687038a5a06ca890e8ab3c4