Misc clean-up