Several small improvements to the Project.xml