Minor changes to ensure xls upload works fine