fix some constraints