Some minor changes to fix worksheets