fixes for PSR2