Fix constraints

... to work from