Update notes for submitted changes

* Fix dispose issues identified by Gendarme (part 3)