some psr format fixes