Update notes for submitted changes

* Fix some reentrant scenarios