fix a few more mistakes after the psr-4 conversion