TEIID-2663 minor improvements