Fixing some bugs in retry fields.