Minor changes to create_company