Minor constraint fixes.