BZ-10553 baseline fixes.