More bug fixes to EpwFile parsing