More fixes
PircBotX patch