fixes in export