A few more bug fixes for CTF