Minor fixes related to the last commit.