Fix PSM samples