PSR-2 related fixes