Minor CS improvements