Some more CTF fixes/changes.