CS Fixes