Minor CS changes