Fix embedding issues