More PSM build fixes.