Two small changes to improve use for Kobo ereaders

See comments at the commits.