fix cs issues