Bug fixes to the current message context
starting to add timeout to callbacks