Fix mapping of constraints