Small fixups to previous commit.