Fix issues with timeouts and retries
Handle 0.10 missing "aborted" event.