Fix some CS