[CS] Fix fabbot suggestions and @javiereguiluz suggestions