Fix things I broke in the last commit.