Fixes export issues