Small changes to the CTF item handling.
Also fixed a typo.