Minor PSR-fixes