Spreadsheet next release fixes for testing round 2