Fix some of the Hound issues