5.0 CS Fixes And Minor Fixes