misc changes for PSR2