Address some comments by demobox.