CS fixes
Minor improvement