Improvements to 'xe host-apply-edition'