#108258: Minor changes so it deploys easier.