Fix typo & CS