Fix exporting issues