Plug a couple of leaks in xmpp

Change-Id: I2f72e21e60aa03b21cdc3cb550137fb99b4d2b97