Fix regressions in last commit.