Plug a couple of leaks in xmpp

Change-Id: Iea7bee97389c0fcd3b90475040dd888dc18256c0