TEIID-2986 fixing issues with embedded