add fixes about contractors