Small changes to ShapefileReader