Fixes the issues for export