Making ready for xenon build ...