This should fix up all the wonky business during the demo.