[Global] Some other fixes to the Welcome messages system