bugherd_104 and other fixes