some more PSR fixes