some loading fixes for PSR-0