Company ID fixes