Nov6 design review fixes.