Fixes for embedding in presentations