TEIID-2863 minor refinements