Fixed some details missed from the last commit.