Fix cs errors

#3006