CS fixes for previous commit