More NOTES changes.