Minor fixes that were suggested after a live demo

Minor fixes that were suggested after a live demo