Various CS Fixes