Undo_retrans counter fixes