Fixes without the incomplete lecture

Please review the colophon, and if you like it, merge.