A charge air cooler includes a battery of round tubes that extend between a first header plate and a second header plate arranged at a first end and a second end, respectively, of the charge air cooler. Stresses in corner tubes caused by differential thermal expansion between the tubes and side plates of the charge air cooler are reduced by having a reduced thickness over a portion of the header plates, or by directing a portion of the coolant through the side plates, or both.