Minor fixes to previous commit.