Just some more bug fixes (Mainly CTF)