Fixes to XMPP for static analyzer issues
Fixes to XMPP for static analyzer issues