Fixed problems in NoteField from rebasing.