Minor changes to make demo smoother.