Additonal fixes on notes ALFA