Fixing issues identified in tailor