fixes to notificate_retry code