Fixes for exporter compatibility