More mcabber changes