psr fixes