Various constraints section edits