Fixing a few CS errors