A couple of bugs on reading in last commit.