Some changes that should have been part of the previous commit.