Minor "finlir" changes