CS fixes for #6575