Update for Teiid 8.4.1 compatibility