BUG: 1886832 and other fixes from hydra-spec