Minor CS Fixes

See the commits for details.