holoirc: fix many of the reported bugs from 2.6.1