PSR-4 fixes
Bugfix in #173