fix some CS