Updates to make XML happy.