Fix CTCP handling a bit