Fixes from first run through of demo