Minor misc improvements