Bug fixes from demo run-through