Add more timeouts for potentially long-running commands.