Fix ha robustness issues

Multiple fixes for issues found in HA robustness runs