Fixes for tailor correctness