Minor changes to demo code.