Small demo fixes.