Some CS

Just some small CS fix (see commits)