Fix multiple problems in prior releases, including include reads (not writes) past the end of a buffer.