[4.1] Minor CS Fixes