Misc clean-ups.