Fixes for embed