psm provider bug fixes