timeout tweaks, recompile to get go1.3 timeout fixes