Minor mods to timeout/retry parameters