CS Fixes And Minor Tweaks

Why did we need that ?