Small company mode fixes.