Update notes for submitted changes

* Make error message for InvalidTemplateReference sane