Applying suggested CS fixes