CS fixes

This seems weird?