Fixes to BAM reader after header changes