Re-apply "minor changes on PT for Site setup"

This reverts commit 1292478492bd4d1b2bcf05b87fdac50c496d7e5c.