#234, more timeout tweaking