Small fixes in PSR-3