Address more hound comments