Minor fixes that were suggested after a live demo