Even more fixes for HoundCI