I think I've fixed the issues with saving and loading using the new CockTypesEnum format.