some PSR compatibility changes