* I think this cleans up the remaining XMPP bugs. We now see the correct number...