bigbreak CS fixes.