Buffer tanks and DHW tanks