Update messages special to handle async issues