Yet another HA related changes