Plug a couple of leaks in xmpp

Change-Id: Ia6268c06e1f96bec4208c805617b2ad4a6e40036