Fixes for shareable live version