Small fixes for PSR