Some PSR-0 Fixes