Bug fixes for tomorrows demo.