Fixes to exporter and editions helper after CIP changes