Fixes to PSR-4