Some tweaks to company and POC