Adopt new hydra expression convention + fix builds