Fixes to converted embed