Fix last two demos