And some more fixes for HoundCI