Fixing co and callout handling