[4.2] A Few CS Fixes

Just a few minor fixes here.