Fix issues cited by Hound