Small CR fixes.