Fixing tailor warnings