Code Review fixes.