Constraint fixes and the collect operator