CS fixes

[skip ci]