Move to slightly more relaxed timeouts for avalon.