Made some fixes for demo.