Further improvements for staging / production support