Correct a few types and constraints.