Fix a number of demos, comment out broken ones.