Type fixes from previous commit.