Fix constraint changes