Small PSR enhancements