Checkpoint after fix to notesettings (changes to static)