Fixed compilation errors caused by the last commit.