More PSR-0 fixing