"Hero-unit" & "Personal messages" fixes