Further tweaking timeout values