Fix failing demos