Some changes that should have gone in last commit.