More CS Fixes