Minor changes to core irc func