Fixed up a few more types.