Fix bugs identified during product export