Embed fixes