Fix company setup