fixes for CO snippets