Some syntax fixes suggested by HoundCI