- Various fixes to previous ts5 removal changes


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@3136 82007160-df01-0410-b94d-b575c5fd34c7