3.0 - Fix CS errors