Some fixes for "Remove text for HI" - thx Thunderbolt8 :)