Slight tweak of how notes are handled.