Making sure we don't read in more bytes than we need in a few places, as it was exacerbating an existing issue.