Fix issues in l-1 l-2