Small improvements for the latest commit.