Small additional adjustments for the previous commit.