Updates to support more "isStaging" stuff