Fixed demo issues