CS fixes and one test fix.