Update notes for submitted changes

* Fix two more issues related to reusing SingeltonContainer