Fixed cs issues