Change copies and fixed problem for loading companions