Fixing export package issues