Fixed some cs issues