Adopted new Hydra convention + fix builds