Fixes on notes management