Complete the PSR-2 fixes