[4.2] CS Fixes For Latest Merges

Minor things here.