Fixed up Jabber support