CS fixes + typo