3.0 cs fixes