Different timeouts, better logging