Fix constraint issues.