Minor CS fixs