[5.0] CS Fixes

A few little niggles.