Cleaning up Hound issues