Fixing various export issues