Small improvements to the latest commit.