Apply minor CS fixes