Review fixes from Lee.