Retry mode for monitor plus a few minor tweaks.