More improvements for demo.