Update ll according to the bugs reported