Minor changes regarding to the last commit.