Bugfixes for the previous bugfixes