Fix errors that emerged in prior commit.