Fixed some errors around irc_payload vs normal payload