Fixes for "Export to Excel"