Misc clean-ups