Some changes for PSR-1 compatibility