Other CS Fixes