More fixes for HoundCI