tweaks to help duration timeouts