Fix some issues with the Excel export, other small improvements