Fixed a bunch more blueprint xml inconsistencies.