Fixed HA issues