Bugfixes for the PR you just merged

Sorry :(