second round of hound fixes