Fixing export issues