PSR-0 misc changes