updates for PSM build.