Minor tweaks and improvements to demos