fix some mistakes after the psr-4 conversion