Timeout tweaks