CS Fixes And Other Fixes