TEIID-2610 fixing various protocol issues