minor
Merging bugfix/warnings into features/constraint.