CS fixes to standard PSR-2