CS fixes to new standards