Bugfixes for the previous commit