Further export improvements