Bugfixes relating to last commit.