Changes missed from previous commit.