Fixes to Excel.php