Fixes for embed dialog and embedding.