schema fixes to embedding