Various fixes and improvements to demos.