Tweaks to support HA deployment
Merge pull request #224 from nhr/ha_tweaks

Tweaks to support HA deployment