more exporter + weaver fixes