Atempt to fix encoding meta-data in connectors and drivers