Fix retry strategies