Tailor fixes