Fix stuff introduced with last commit.