PSR Fixes