Fix CS errors.
Fix errors due to 2.x merge.