Minor changes to xml files, etc., found during testing

Pulling changes into my version