PSM threading fixes