More fixes to note.c