Fix of some hardcodings in messages