tailor & constraint fixes