Fixed the missing/outdated constraints.