bug fixes to submission msg_store retries