Fixes depended companyHandler changes