CS Fixes

I've targeted this at 4.3 rather than 4.2 due to the fact its not really a "bug fix".