CS Fixes

k