Bugfixes related to worksheet