Fixing staging bugs in site.pp