Several fixes for L