Fix constraint support.