Minor fixes for the last commit.