Minor CS Fixes