Some cooperation fixes