constraint fixes