Fix hound reported issues