Bug fixes from the presentation