fix some breakages found by Hydra