Minor adjustments from last commit.