Fixes for the next Kindle

Transcript