[4.2] Minor CS Fixes

How did these get here? :(