Issue: CTA bug fixes