Add support for retry >= 0.4
Rename a flag