Fixed constraint issues.