Fixed up some of the demos.