import/export fixes