Embed and GA fixes