More fixes for IRC to PSO2