Improve handling of XLSX files