Base: Improve retry handling