Updated procedures for better handling of timeout messages.