EAGLESIX-2651: Cond: fix minor bugs w/ 2.6.5 port