More CS fixes for PSR-2