more HA change mode fixes