CS Fixes

Gotcha, thanks