Updates to get the demo for 20140527 working