Bug fixes for presentation