EmbedXcode+ upgrade

Changes resulting from  EmbedXcode upgrade