Fix demo mode
More fixes for image playlist