Fixes and completes r1640588 and more minor things which were left after the change from run-install to load-demo