Fix some constraints