Fixed a couple of problems in the teiid derivers

Fixed a couple of problems in the teiid derivers introduced by refactoring in the deriver layer