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