Embed widget fixes