Minor changes to Messages