More minor changes for demo.