Fixes made for live demo