minor CS fixes