small fixes for PSR2