Last few fixes for demo.