Some misc. clean up.