Bugfixes caused by previous updates