Tweaks to set defaults for staging