Fixes by hound ci violations