Tweaks to support HA deployment