#79: Updated timeouts