Minor misc clean-up