Added timeouts in confirmation buffer