Add HA option and minor fixes

No match.