timeout bug fixes