Fix IRC issues by mcforzz and alj