Plug a couple of leaks in xmpp

Change-Id: Id136339926fe0f24cc0f72df9a1d985cff7c8184