Minor CS fixes.