Some hot-fixes on editting notes