Fix HM-CC-RT-DN and HmDialog