Fix some more cs issues