Fixing demo issues