Various improvements in support of building a presentation (#4095)