Fix welcomemessage issues