PSR-2 compatibility fixes