Plug a couple of leaks in xmpp

Change-Id: Ifbc78e3eff990d5f80e748f737ff87a39f3fed93