CC - Fix review feedback.