Some minor CS fixes