Added more "timeout" calls, needed by issue_021