Fixing Exporter dependencies