Some adjustments required to get the demo to work again.