Pumps and tanks