More minor fixes for embed