Additional patches to previous commit.