Oops, fixed a bug.
Minor constraints changes.