Fixed more Tailor issues