Misc. clean-up.