Fix company bugs