More minor changes while digging in XmppConnection