Some CS fixed