CTA fixes
Merge pull request #342 from scrollback/smallfixes

CTA fixes