FIXUP: hound fixes