Custom field fixes, company is object