some constraint fixes