PSR fixes
Tweak stuff