Final CS fixes
Moar code coverage