Fix complaints from Hound