setup-site: Various improvements