More tweaks to how notes are handled