Fixed some MTL issues that arose from removing ConstraintKinds