Bug fixes in messsage.yml