Bug fixes caused by previous commit.