Add minor tweaks for Hydra base box