Fixes to the EPUB output