CSConfig changes, minor changes