Fix more issues with enc/dec of las