Plug a couple of leaks in xmpp

Change-Id: I0329b2e6fbe5bd25b6541e33251865be707e1b15