FIXUP: More hound fixes