Cs fixes

This should also be reverted