EmbedXcode+ Upgrade

Changes as part of upgrading to EmbedXcode+