Fix CS, minor changes