Various fixes to IRCformatter

Change-Id: I641bce06147e25a557d4de9003ee3c541d641ca7