Fixing a couple CS problems