Calamity and hydro tweaks