Last minute fixes for the presentation demo