Some minor fixes not included in last commit.