Issue 3487: A few more tweaks to the staging environment

Issue 3487: A few more tweaks to the staging environment