Small fixes during reading code.