Fixes for epub format