Update on fixes (ABL)