Fix retry and repeat options