Fix cs errors

#3541