Fixes for live demo