Fixes for PSR-4